Merge.
authorSteven Smith <ssmith@xensource.com>
Fri, 1 Dec 2006 13:12:41 +0000 (13:12 +0000)
committerSteven Smith <ssmith@xensource.com>
Fri, 1 Dec 2006 13:12:41 +0000 (13:12 +0000)

Trivial merge